From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 27 Jun 2018 04:52:04 +0000 (+0100)
Subject: Merge version 1.11.10-1+rpi1 and 1.11.10-2 to produce 1.11.10-2+rpi1
X-Git-Tag: archive/raspbian/1.11.10-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=77fddb6b9eb1045e67c419666244b6929a3f2d85;p=hwloc.git

Merge version 1.11.10-1+rpi1 and 1.11.10-2 to produce 1.11.10-2+rpi1
---

77fddb6b9eb1045e67c419666244b6929a3f2d85
diff --cc debian/changelog
index b08bf79,e49ecc9..098d59d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- hwloc (1.11.10-1+rpi1) buster-staging; urgency=medium
++hwloc (1.11.10-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.11.8-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Sep 2017 01:56:00 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Apr 2018 02:35:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Jun 2018 04:52:03 +0000
++
+ hwloc (1.11.10-2) unstable; urgency=medium
+ 
+   [ Alexander Kurtz ]
+   * control: Mark libhwloc-plugins as Multi-Arch: same (Closes: Bug#901558).
+ 
+   [ Helmut Grohne ]
+   * Mark libhwloc-common and libhwloc-doc Multi-Arch: foreign.
+ 
+   [ Samuel Thibault ]
+   * Use https URL
+   * Bump Standards-Version to 4.1.4
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Sun, 17 Jun 2018 15:39:50 +0200
  
  hwloc (1.11.10-1) unstable; urgency=medium